bitkeeper revision 1.1159.187.60 (41b899a4tjdjzfL7v1mQOH5gIHlqQQ)

Another sysrq fix...

diff --git a/tools/python/xen/xend/XendClient.py b/tools/python/xen/xend/XendClient.py
index 91efd5cc8e86fbbed0ab02a24b5844cc606d7c17..4e733b7fde6bffa598106d6d0c7565e197865e59 100644 (file)
--- a/tools/python/xen/xend/XendClient.py
+++ b/tools/python/xen/xend/XendClient.py
@@ -228,7 +228,7 @@ class Xend:
         return self.xendPost(self.domainurl(id),
                              {'op'      : 'pause' })
 
-    def xend_domain_shutdown(self, id, reason, key=None):
+    def xend_domain_shutdown(self, id, reason, key=0):
         return self.xendPost(self.domainurl(id),
                              {'op'      : 'shutdown',
                               'reason'  : reason,

diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py
index 4e614af54e1fec0d11bc04e987dcbc4f3fbb3dec..1b01b43cfa6359a9438049b7571e77d65b989611 100644 (file)
--- a/tools/python/xen/xend/XendDomain.py
+++ b/tools/python/xen/xend/XendDomain.py
@@ -455,7 +455,7 @@ class XendDomain:
         except Exception, ex:
             raise XendError(str(ex))
     
-    def domain_shutdown(self, id, reason='poweroff', key=None):
+    def domain_shutdown(self, id, reason='poweroff', key=0):
         """Shutdown domain (nicely).
          - poweroff: restart according to exit code and restart mode
          - reboot:   restart on exit

diff --git a/tools/python/xen/xend/server/SrvDaemon.py b/tools/python/xen/xend/server/SrvDaemon.py
index 916d70a00c855048e262f9c58b50eeeaae5a4065..338d6e4d4a61369903e4fc3029079c658311e1f0 100644 (file)
--- a/tools/python/xen/xend/server/SrvDaemon.py
+++ b/tools/python/xen/xend/server/SrvDaemon.py
@@ -711,7 +711,7 @@ class Daemon:
             raise XendError('Invalid console id')
         console.disconnect()
 
-    def domain_shutdown(self, dom, reason, key=None):
+    def domain_shutdown(self, dom, reason, key=0):
         """Shutdown a domain.
         """
         dom = int(dom)

diff --git a/tools/python/xen/xend/server/domain.py b/tools/python/xen/xend/server/domain.py
index 17483dcc42568fb5f6b487a0552a83a099722a06..eb0dbcf48b01ecb773559be43c38fc5f80194351 100644 (file)
--- a/tools/python/xen/xend/server/domain.py
+++ b/tools/python/xen/xend/server/domain.py
@@ -37,7 +37,7 @@ class DomainController(controller.Controller):
         self.addMethod(CMSG_MEM_REQUEST, 0, None)
         self.registerChannel()
 
-    def shutdown(self, reason, key=None):
+    def shutdown(self, reason, key=0):
         """Shutdown a domain.
 
         reason shutdown reason